background: don't leak background objects during quick changes

We currently let some backgrounds "fall through the cracks" if
a bunch of change notifications come in at once.

This commit fixes that.

https://bugzilla.gnome.org/show_bug.cgi?id=697395

diff --git a/js/ui/background.js b/js/ui/background.js
index 88c79e2251c10d7e9af0d8fb2c7a83d675cca02b..4994c05a3518d5bd0e67da3638946c38a278e988 100644 (file)
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -742,11 +742,15 @@ const BackgroundManager = new Lang.Class({
                                    time: FADE_ANIMATION_TIME,
                                    transition: 'easeOutQuad',
                                    onComplete: Lang.bind(this, function() {
-                                       if (this.background == background) {
+                                       if (this._newBackground == newBackground) {
                                            this.background = newBackground;
                                            this._newBackground = null;
-                                           background.actor.destroy();
+                                       } else {
+                                           newBackground.actor.destroy();
                                        }
+
+                                       background.actor.destroy();
+
                                        this.emit('changed');
                                    })
                                  });